Fix hl-line-mode/global-hl-line-mode logic again

* lisp/hl-line.el (hl-line-mode): Make explicit calls to
(hl-line-mode 1) work again when global-hl-line-mode is on
(bug#58478).

diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 693c94eea8cea3a127d2fd974cca9a741f1a557a..87bea1017f1f408fa5985e84918c7be7baa96bce 100644 (file)
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -156,7 +156,8 @@ line about point in the selected window only."
   :group 'hl-line
   ;; If the global mode is switched on, then `M-x hl-line-mode' should
   ;; switch the mode off in this buffer.
-  (when global-hl-line-mode
+  (when (and global-hl-line-mode
+             (eq arg 'toggle))
     (setq hl-line-mode nil)
     (setq-local global-hl-line-mode nil)
     (global-hl-line-unhighlight))